Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,895 Commits 3 Branches 0 Tags
0272b31b5268564fc6e6e580ac1b1701a4e7e2b7
Commit Graph

32464 Commits

Author SHA1 Message Date
Jonathan Dixon
13ca868b82 am 3bd13f3a: am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '3bd13f3a74a2dd47c217fda206490334747293cc':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 11:10:48 -07:00
Wink Saville
0cbc781134 am e7329140: am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'e7329140c0ff846acf5bc8749f525b18880177ef':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-04 11:10:16 -07:00
Alan Viverette
1461e26674 resolved conflicts for merge of 92a827b8 to master 
Change-Id: Ia262f5c80cdaa391db08f766cee62919a8705e80
 2013-10-04 10:17:09 -07:00
Dianne Hackborn
a37bbc6afc am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
  KLP/KitKat is now API 19.
 2013-10-04 09:11:32 -07:00
Jonathan Dixon
4aa55c006f am 34eb4f3d: am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '34eb4f3d167cb0af07f772a1bfe56603ec3dd268':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-04 09:11:28 -07:00
Eino-Ville Talvala
0974bcbfbd am 61e5349d: am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit '61e5349dfbed1b09b1c99a56ef03c3ad95755ffc':
  Camera2: Implement idle callbacks
 2013-10-04 09:11:24 -07:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
 2013-10-04 09:11:17 -07:00
Dianne Hackborn
4bfeed9499 am 61509ca5: am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '61509ca5bafbe59e29e1eaaaa938c5a668352cba':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-04 09:11:14 -07:00
Dianne Hackborn
54588821b1 am 5eaac1ce: am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit '5eaac1ce334c0a488fee44d1a9ef5f20ff7d84ea':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-04 09:11:10 -07:00
Dianne Hackborn
10a4d0b46e am 495fe22d: am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '495fe22d680c1674598184d08a01d5b961c13fc5':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-04 09:11:07 -07:00
Daniel Sandler
cf4ed58514 am 12aea9d7: am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '12aea9d7972abad702f9ded550179af722acdf47':
  Goo goo ga joob.
 2013-10-04 09:11:03 -07:00
Marco Nelissen
2a0a5d1022 am d9ff894e: am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit 'd9ff894eae0b3acd3c89585a80ebd2039ed1de8c':
  Add PowerManager method to assign blame to a single uid
 2013-10-04 09:10:53 -07:00
John Spurlock
b7ba2630bd am bee8af82: am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'bee8af8207938fb0d29b38d915be1803edc64d69':
  Store decor rects per window for transition cropping.
 2013-10-04 09:10:17 -07:00
Jonathan Dixon
3bd13f3a74 am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '6079dbc1ae0fe0c8c8d642d072514e1ea94d1ac5':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 07:23:05 -07:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic 
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
 2013-10-04 14:23:47 +01:00
Wink Saville
e7329140c0 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:30:29 -07:00
Alan Viverette
913949dbd6 Merge "Simplify matrix calculations for display adjustment" 2013-10-04 01:05:10 +00:00
Wink Saville
a48ccdd6fb Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 2013-10-04 00:52:59 +00:00
Alan Viverette
36f4b08341 Simplify matrix calculations for display adjustment 
Removes MatrixUtils, which is now unused.

Change-Id: Ifa809d2aeafa415d3861e59e4c7a8b115e76a2df
 2013-10-03 16:46:04 -07:00
Christopher Tate
f2d9391b33 am 64884eef: am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit '64884eef54bb110cead05d9b3f1a5928d5cf5349':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 16:43:20 -07:00
Adam Lesinski
38dc2ad85e am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit 'b2db2fbce33dbcfa52ccb20267ad4897c558c34f':
  Private flags are masked in correct variable
 2013-10-03 16:43:17 -07:00
John Reck
eebcc0ff60 am cd6a2d30: am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit 'cd6a2d3079ee67658535773021c16787b9adba6e':
  Reduce max recents on lowram
 2013-10-03 16:43:09 -07:00
Alan Viverette
92a827b816 am a6125957: am 093318ee: Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 
* commit 'a612595733483213d757fd1bb9c976b06d61a38b':
  Add importantForAccessibility mode to block entire hierarchy
 2013-10-03 15:41:41 -07:00
Dianne Hackborn
8a5f7ab6e1 am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
  KLP/KitKat is now API 19.
 2013-10-03 15:39:44 -07:00
Jonathan Dixon
34eb4f3d16 am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '4730dda880097b1c25096e323be8a527fd6e0b09':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-03 15:39:42 -07:00
Eino-Ville Talvala
61e5349dfb am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev 
* commit '31ea028e71af59ebf7b5fe9dd215e61b8d86d162':
  Camera2: Implement idle callbacks
 2013-10-03 15:39:39 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 15:39:33 -07:00
Dianne Hackborn
5eaac1ce33 am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 15:39:30 -07:00
Dianne Hackborn
495fe22d68 am 2d3f995a: am d585f954: Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 
* commit '2d3f995a65f2acd60559b1db57ae3ab2346a1df0':
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
 2013-10-03 15:39:27 -07:00
Daniel Sandler
12aea9d797 am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev 
* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.
 2013-10-03 15:39:24 -07:00
Marco Nelissen
d9ff894eae am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 
* commit '05f56fc121e176ef4e227639a7b636a875f38037':
  Add PowerManager method to assign blame to a single uid
 2013-10-03 15:39:18 -07:00
John Spurlock
bee8af8207 am c3752cfb: am e660ecc4: Merge "Store decor rects per window for transition cropping." into klp-dev 
* commit 'c3752cfb6d5381795433ccdbcd8f84cada832790':
  Store decor rects per window for transition cropping.
 2013-10-03 15:38:52 -07:00
Christopher Tate
64884eef54 am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 15:38:47 -07:00
Adam Lesinski
b2db2fbce3 am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit '6d90862f2387d24c28e9d1c8f080cb9a4ff15011':
  Private flags are masked in correct variable
 2013-10-03 15:38:44 -07:00
John Reck
cd6a2d3079 am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit '47dc3248e09002a5a55dc427f752da8ebd623868':
  Reduce max recents on lowram
 2013-10-03 15:38:38 -07:00
Alan Viverette
093318eeac Merge "Add importantForAccessibility mode to block entire hierarchy" into klp-dev 2013-10-03 20:33:56 +00:00
Dianne Hackborn
7192c6d7c6 Merge "KLP/KitKat is now API 19." into klp-dev 2013-10-03 19:19:10 +00:00
Dianne Hackborn
6bc3789b39 KLP/KitKat is now API 19. 
Bug: 10348975

Change-Id: I19bf1a56064deda2e59085520960aac8ce3a825b
 2013-10-03 12:17:31 -07:00
Jonathan Dixon
46507f4bc7 Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 2013-10-03 18:52:56 +00:00
Eino-Ville Talvala
b77b7babd5 Merge "Camera2: Implement idle callbacks" into klp-dev 2013-10-03 18:33:54 +00:00
Dianne Hackborn
0d763a901e Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296 Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 2013-10-03 17:44:38 +00:00
Dianne Hackborn
d143d1ffd7 Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 2013-10-03 17:44:18 +00:00
Dianne Hackborn
fd6c7b12c3 Fix issue #10378741: configupdater needs to be explicit when it calls startService() 
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.

Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
 2013-10-03 10:42:26 -07:00
Dianne Hackborn
d585f95406 Merge "Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle..." into klp-dev 2013-10-03 17:23:04 +00:00
Daniel Sandler
0a66052837 Merge "Goo goo ga joob." into klp-dev 2013-10-03 17:20:21 +00:00
Dianne Hackborn
4a7d824c3b Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle... 
...fails from KRS84 across all platforms

My fix for issue #10807048 was wrong, wrong, wrong.  The problem was
actually just a stupid mistake in ArrayMap.erase().  This makes it
all right.

Change-Id: I762f7a2d5100bceb86a091ab3d6368edc21b4266
 2013-10-03 10:19:20 -07:00
Jonathan Dixon
eb9e801424 Decouple construction of WebView, CookieSyncManager, WebViewDatabase 
Bug 10932261

Most of this flow exists purely to get the Context from
CookieSyncManager.createInstance over to WebViewDatabaseClassic. Make
that depenency more explicit (with a TODO to remove it) and this allows
a much simpler CookieSyncManager implementation for the normal case.
Note after this patch, CookieSyncManager.getInstance() is technically fine
to call without a prior call to createInstance, but retaining the
ordering requirement as a convenience for anyone developing on new OS
but still supporting the older versions.
(Note that CookieSyncManager instance is not required for correct
operation of either existing webview, so these changes only impact
the public API contract of object lifetimes, not the underlying
implementation)

Change-Id: I51fdd6622704f1c749277fee6df2f84ac4c704d2
 2013-10-03 17:53:33 +01:00
Marco Nelissen
95867a6524 Merge "Add PowerManager method to assign blame to a single uid" into klp-dev 2013-10-03 16:34:57 +00:00