Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,755 Commits 3 Branches 0 Tags
012bdf54068aff9979df62ca7e6606e1ecd9410b
Commit Graph

27544 Commits

Author SHA1 Message Date
Christopher Tate
012bdf5406 am 1c9f740a: am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit '1c9f740adbee3ddcfd163ea030415630f277c950':
  Per-user content observer APIs
 2012-09-18 00:09:50 -07:00
Adam Powell
f307cb23f0 am 52761d23: am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '52761d23b0b344778ae9791515c11da4d25e17e8':
  TaskStackBuilder correctness fixes
 2012-09-18 00:09:42 -07:00
Dianne Hackborn
560f555c43 am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit 'c0b590932d611e842836d1662a4baa4812d07b21':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:09:31 -07:00
Christopher Tate
f1aa107b18 Merge "Per-user content observer APIs" into jb-mr1-dev 2012-09-17 17:34:00 -07:00
Adam Powell
49a22f2969 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 2012-09-17 17:15:09 -07:00
Christopher Tate
16aa973617 Per-user content observer APIs 
Callers with INTERACT_ACROSS_USERS_FULL permission can now observe content
for a given user's view (and can notify content uri changes targeted to a
specific user).  An observer watching for UserHandle.USER_ALL will see all
notifications for the given uri across all users; similarly, a notifier
who specifies USER_ALL will broadcast the change to all observers across
all users.

The API handles both USER_ALL or USER_CURRENT, and explicitly forbids
any other "pseudouser" designations.

This CL also revs the Settings provider to notify with USER_ALL for
changes to global settings, and with only the affected user's handle
for all other changes.

Bug 7122169

Change-Id: I94248b11aa91d1beb0a36432e82fe5725bb1264f
 2012-09-17 16:35:36 -07:00
Dianne Hackborn
4246f695f4 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 2012-09-17 16:19:14 -07:00
Adam Powell
75e0af8982 TaskStackBuilder correctness fixes 
* Don't mutate original intents when adding default flags.

* Add the relevant flags to the array returned by getIntents() such
  that it can be used directly in a call to startActivities or
  similar.

* Deep copy the component intents when building an intent array for
  getIntents()

* Clean up some internal code duplication

Change-Id: I71d3b7f30d4f7d8f1cce778d406ea0e513d382c5
 2012-09-17 16:16:55 -07:00
Dianne Hackborn
ad9b32115b Try again to fix issue #6912004:tap on gmail notification sends me to home screen 
Add a new call to the activity manager to tell it when the activity
is resumed, so it can mark its state as dirty then instead of when
it first tries to create it.

Also tweak things to update the LRU list for the upcoming activity
at the point we start pausing the current activity, to avoid an
inefficiency where we may decide to kill the process of the upcoming
activity if it is at the end of the LRU list.

Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
 2012-09-17 16:03:22 -07:00
Philip Milne
417e267a75 Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev 2012-09-17 15:47:11 -07:00
Victoria Lease
b19f313e25 am 976ed471: am d6991106: Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 
* commit '976ed4711ef5fc943ad94a8cbb251cd5feb34cde':
  Avert crash when dragging text in same TextView
 2012-09-17 15:12:05 -07:00
Victoria Lease
d6991106b0 Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 2012-09-17 15:08:07 -07:00
Elliott Hughes
af73eb8526 am 45b09c00: am 7134ef60: Merge "Fix date formatting for fa locales." into jb-mr1-dev 
* commit '45b09c0044893e9b549de0eeb20a925a8549cd52':
  Fix date formatting for fa locales.
 2012-09-17 14:55:09 -07:00
Adam Powell
3e8190d913 am 3987a032: am e01538f2: Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 
* commit '3987a03261785cbbca92f247635708d23c84ff5c':
  TaskStackBuilder - use the correct package for looking up parents
 2012-09-17 14:54:28 -07:00
Chet Haase
9c16ed747a am ee6113a6: am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev 
* commit 'ee6113a62099e079df9ffa1b173feb728d08c191':
  Fix occasional crash bug with layers
 2012-09-17 14:54:15 -07:00
Amith Yamasani
4a1e7e3c59 am 83385ecc: am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit '83385eccc5274443d90d4c4dc821e6281fee4af6':
  Add UserManager.getUserIcon()
 2012-09-17 14:54:05 -07:00
Eino-Ville Talvala
c5eb2b5d90 am 978f5c6a: am b181909e: Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 
* commit '978f5c6a2c3c6088ff77fbe84fbf3976b631346b':
  Camera: Document face detection confidence recommendations.
 2012-09-17 14:52:49 -07:00
Eric Laurent
1eb6f0f84b am 0d2c4fb0: am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '0d2c4fb08a8225909295c10602c83f63aa155f95':
  headphone volume limitation
 2012-09-17 14:46:28 -07:00
Dianne Hackborn
00c4b0c015 am 86fa4926: am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '86fa49265e8df22e444e36717a956a3470352e7b':
  New uninstall option to uninstall for all users.
 2012-09-17 14:45:58 -07:00
Elliott Hughes
7134ef60b7 Merge "Fix date formatting for fa locales." into jb-mr1-dev 2012-09-17 14:45:42 -07:00
Dianne Hackborn
0ab7308e99 am 831f31c3: am b137c806: Merge "More adjustments to permissions." into jb-mr1-dev 
* commit '831f31c3883899eb57f28360bb51192937124081':
  More adjustments to permissions.
 2012-09-17 14:45:40 -07:00
rich cannings
8e58987e35 am 2357a77b: am 42af7518: Merge "Add setting to change verifier visibility" into jb-mr1-dev 
* commit '2357a77bf50413c8eb7f576a8b757b394e440edf':
  Add setting to change verifier visibility
 2012-09-17 14:45:16 -07:00
Adam Powell
67f3a40cc3 am bf78fc2a: am 89e68d78: Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev 
* commit 'bf78fc2abfc15643f72ceb0f270e01ef900fb56f':
  Create main activity intents as needed for TaskStackBuilder/Up nav
 2012-09-17 14:45:10 -07:00
John Huang
6d30ca0163 am 45c5089a: am 4505a43f: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 
* commit '45c5089ab572155d1b0694c5f909072cbc29ad74':
  Add support for per-package policy for sending premium SMS.
 2012-09-17 14:44:50 -07:00
Adam Powell
45ada3ac78 am 45937740: am b1861c3e: Minor fixes/clarifications for previous patch. 
* commit '4593774015ada7fb92f846fced136e487cd1e522':
  Minor fixes/clarifications for previous patch.
 2012-09-17 14:44:34 -07:00
Adam Powell
c86dae2337 am 3b6dc021: am 7db4eec5: Merge "Squish!" into jb-mr1-dev 
* commit '3b6dc021de2d19c021058df5af4fb8a05613d113':
  Squish!
 2012-09-17 14:44:26 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Philip Milne
8e1c2b6b71 Revert "Simple MVC based binding mechanism for android controls." Do not merge. 
This reverts commit 989709a973.

Change-Id: Ifc2c511b0d99d4a3a164b4a2281ca140015b366d
 2012-09-17 14:31:03 -07:00
Adam Powell
e01538f28b Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 2012-09-17 13:54:31 -07:00
Adam Powell
6b6c90523e TaskStackBuilder - use the correct package for looking up parents 
Fix bug 7179104

Change-Id: Ia5d2d285cf22e97c452e0c385ef38c8bce330491
 2012-09-17 13:32:33 -07:00
Chet Haase
f74d2f2fe8 Merge "Fix occasional crash bug with layers" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Geremy Condra
393760861d am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
  Change verifyServerDomainAndCertificates to pass in a hostname.
 2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50 am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
  Remove AndroidKeyStore from API
 2012-09-17 12:46:13 -07:00
Elliott Hughes
7850a41871 am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
664222b066 am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
  Adding accessibility events for touch and gesture detection states.
 2012-09-17 12:45:14 -07:00
Amith Yamasani
3b49f07a45 Add UserManager.getUserIcon() 
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.

Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
 2012-09-17 12:42:00 -07:00
Jatin Lodhia
dbef28ab73 am 4dc67287: am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev 
* commit '4dc67287774495e192193e888fae6603ed85c4be':
  Update account list on account picker activity resume
 2012-09-17 11:29:54 -07:00
Amith Yamasani
0db31ec77d am 3e4ef8e2: am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev 
* commit '3e4ef8e22010f2ede5d822ce3aaa07254079e123':
  Fix face unlock for multiple users
 2012-09-17 11:29:28 -07:00
Kristian Monsen
7f52de24d6 am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev 
* commit '7b1be537546481c6687efd03c3c709b266502abf':
  Hiding some of the deprecated android.webkit API's
 2012-09-17 11:29:20 -07:00
Chet Haase
603f6de35f Fix occasional crash bug with layers 
Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).

When this happens, if the memory got corrupted, it's possible to crash.

The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.

Issue #6994632 Native crash in launcher when trying to launch all apps screen

Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
 2012-09-17 11:21:34 -07:00
Elliott Hughes
34de3bc309 Fix date formatting for fa locales. 
This adds support for standalone months (L versus M) and localized
digits.

Bug: 6811327
Change-Id: I4687a4c67605c31b155c0b8d44b3da6ed378fc82
 2012-09-17 11:17:10 -07:00
Jeff Sharkey
67bbcd036a am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev 
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
 2012-09-17 11:10:16 -07:00
Jeff Sharkey
ddf93f9503 am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
  Move to Global.NETSTATS and Global.NTP constants.
 2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8 am e98aef73: am f229e4d3: Add support for settings for lock widgets 
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
  Add support for settings for lock widgets
 2012-09-17 11:09:55 -07:00
Michael Jurka
5a8deb16b9 am 5f76482f: am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev 
* commit '5f76482f46139809dda13e01ec81ca87ca0803d7':
  Adding a couple extras keys for keyguard widget selection
 2012-09-17 11:09:34 -07:00
Svetoslav Ganov
55ab5105d4 am 71e3cb14: am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev 
* commit '71e3cb143b6eb6052bb6820bf551a1d74e19ee8d':
  Text layout in switch may be null when accessibility events are fired.
 2012-09-17 11:09:16 -07:00
Christopher Tate
ed1c549a7d am 45b2dce9: am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev 
* commit '45b2dce9822caefe69f3f680f9e60f076f9e2eaf':
  Fix Settings writes to a different user
 2012-09-17 11:09:11 -07:00