drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,014 Commits 1 Branch 0 Tags
Commit Graph

150014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
2abea6c457 am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '129ad0e15bafe65f3060b7bd4ea9eb973ece767b':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:45 +00:00
Baligh Uddin
0be2a43284 am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '062feaf39594df4b09fc6e1b005bb72b334f3c79':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:42 +00:00
Baligh Uddin
ec24beafec am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit 'b2df3e40d5bb08295ebb9ee72bd601d88545cc2c':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:38 +00:00
Guang Zhu
b511c4c1d6 Merge "Disable immersive mode confirmation for test automation" into lmp-dev 2014-08-16 03:56:00 +00:00
Guang Zhu
1dbead1103 Disable immersive mode confirmation for test automation 
PolicyControl#disableImmersiveConfirmation to return true as
long as test harness flag is set.

Test harness flag is read via ro.test_harness, and can only be
set to true on builds with root access

Change-Id: I5c2d56e8ea4d5a2972ab42e9a98eb2fce52b11ee
 2014-08-17 16:36:44 -07:00
Dianne Hackborn
89e4ae2f50 Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
d953c53d3b Work on issue #16629489: Google (Play?) Services eating through battery 
There is a bug in how we deal with name overflows combined with resetting
the battery stats data.  If we do a reset while a wakelock is being
actively held that has been put into the overflow bucket, then we can
end up reducing the number of known wake locks in the list so when after
that it is released we try to release it under its real name rather than
the overflow name.

This means we need to keep track of which wake locks have been placed
in the overflow bucket while they are actively being used, so we can be
sure to properly handle it as part of that bucket until it is eventually
released.

This makes things...  somewhat more complicated.  So now we have a class
to take care of all these details, and also use it for other places where
we have the same overflow semantics sync and job stats.

Also fix potential deadlock -- BatteryStatsHelper needs to call on to
ConnectivityManager to find out of there is telepohny, however we use
that class when doing a dump while the battery stats lock is held.  To
fix this, we check the connectivity state up in the battery stats service
before acquiring the lock and propagate that information through to the
dump code.

Change-Id: Ib452206af5c36f4b0f03cc94d2845d36613d1ba5
 2014-08-17 12:39:36 -07:00
Dianne Hackborn
57137289a2 Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
f2ac276127 Fix issue #17082301: replacePreferredActivity is ignoring userId 
It was being given the argument and just...  ignoring it.

But the bulk of this change is to make replacePreferredActivity
better about replacing -- it now detects if the request will not
make a change and, in that case, just do nothing.

The reason for this?

It turns out that each time you install an app, the telephony
system is calling this function over 20 times to set the default
SMS app.  This is almost always doing nothing, but before this
change it means we would re-write packages.xml over 20 times...!

There are definitely more improvements that can be made here (delaying
write of packages.xml to allow them to batch together, reducing
the amount of calls being made), but until then this is a big
improvement.

Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
 2014-08-16 19:34:13 -07:00
Michael Wright
5e8abf8ede Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 2014-08-16 03:56:00 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API 
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
 2014-08-17 17:59:22 -07:00
Brian Carlstrom
d2febbbd4a Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp 2014-08-16 03:56:00 +00:00
Robert Greenwalt
bbca13351a am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent. 
* commit '316c9421eda732bd510631acd9384b593f37f027':
  Add tcp buffer size conduit to NetworkAgent.
 2014-08-17 23:22:32 +00:00
Brian Carlstrom
4eedc1018f PackageInfo is a class, not a struct 
Change-Id: Ibb30e3a13fc086adec8077c8fb8fb17ef54c36b5
 2014-08-17 16:02:33 -07:00
Robert Greenwalt
cd3a2e578d am 8623d854: am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev 
* commit '8623d854f1c9cd1ce4c4f1b706b79627c84f374d':
  Fix a logic error so mtu works.
 2014-08-17 19:07:32 +00:00
Baligh Uddin
5239921739 am 91dec473: (-s ours) am 006f4664: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '91dec47369e22a9f0ed7d741bba99d926cd74ced':
  Import translations. DO NOT MERGE
 2014-08-17 14:17:51 +00:00
Baligh Uddin
d89eb03be4 am 37230c3a: (-s ours) am 9c1a2e53: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '37230c3a9f1cdfade4472104aba970990ed803d0':
  Import translations. DO NOT MERGE
 2014-08-17 14:17:46 +00:00
Baligh Uddin
f9e19bcfd6 am acaa0ba4: (-s ours) am 3b215ba6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'acaa0ba4f69cd1ae1c07f32ebdee1066ae28ea82':
  Import translations. DO NOT MERGE
 2014-08-17 14:17:41 +00:00
Baligh Uddin
67cbd9fad7 am 5cb3feb0: (-s ours) am eba806cb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5cb3feb0a16c3ed32a8a88f448bc489b3b7c7acd':
  Import translations. DO NOT MERGE
 2014-08-17 14:16:39 +00:00
Baligh Uddin
467047a1cf am 34a4fa81: (-s ours) am 5b02800b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '34a4fa8102bbc7d5b016d9eaf6b0e58ed0826797':
  Import translations. DO NOT MERGE
 2014-08-17 14:16:34 +00:00
Baligh Uddin
42f4143775 am f35f652a: (-s ours) am 1805b1a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f35f652a9b86cff1554895cc42d7ac5d83d7eb3b':
  Import translations. DO NOT MERGE
 2014-08-17 14:15:42 +00:00
Baligh Uddin
8dab68b147 am c6c03575: (-s ours) am ca8f9977: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c6c03575952d6351967f8202306544a9e5bdf723':
  Import translations. DO NOT MERGE
 2014-08-17 14:15:38 +00:00
Baligh Uddin
d61723ee99 am cefdf7c9: (-s ours) am 5bbc0df4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'cefdf7c909e875653a1a7771057d99ad7e0b1b5b':
  Import translations. DO NOT MERGE
 2014-08-17 14:15:33 +00:00
Dianne Hackborn
28bb0b8ff3 am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 
* commit '7da20cdf3c36162ab02790dc99a8c7592e86a015':
  Make sure we initialize to enable the default voice interaction service.
 2014-08-16 19:09:39 +00:00
Adam Lesinski
d6b2386df3 am 799b0a34: am 068f8521: Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev 
* commit '799b0a345caa65d6d623030d16291681cd0d4bcb':
  AAPT: Output only 64-bit arch when multiArch is true
 2014-08-16 07:00:24 +00:00
Jae Seo
3f887f969a am b6ba4f21: am d250789a: TIF: Make passthrough related method names consistent 
* commit 'b6ba4f21cf4bae50b0cfebe55a34ab198dec4c26':
  TIF: Make passthrough related method names consistent
 2014-08-16 05:07:13 +00:00
Baligh Uddin
427de9c381 am 82ffe80d: (-s ours) am fc2f256c: (-s ours) am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '82ffe80d7819e6b64d05033c9c61187e9eca25ef':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:55 +00:00
Baligh Uddin
393c90298b am b5b4f7e8: (-s ours) am ddc8d474: (-s ours) am fc5f24d8: (-s ours) am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b5b4f7e88344c7e4b9d7561d652dba2816766cd1':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:45 +00:00
Baligh Uddin
cf5081b3b2 am 1a22f939: (-s ours) am fbe4307d: (-s ours) am bd42c307: (-s ours) am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1a22f939dac358018ca3ff3df07068a8cdd06262':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:40 +00:00
Baligh Uddin
d59dd00f8b am 7bcc6165: (-s ours) am f059e734: (-s ours) am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7bcc6165fae922915d82702ffe719dc8182c587c':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:27 +00:00
Baligh Uddin
0c0ea8479b am a1bc3332: (-s ours) am de8ffd03: (-s ours) am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'a1bc333255eef7e39865086250c9cde531f9d230':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:18 +00:00
Baligh Uddin
952e3e6f3b am 7ee7c3d6: (-s ours) am 546677e3: (-s ours) am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7ee7c3d62b9cfa5e4d206ad3d70996306f68a50d':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:07 +00:00
Baligh Uddin
b58d8d6704 am be306319: (-s ours) am dfc65278: (-s ours) am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'be30631910d31e3d8cb0b242d05c7f73a3a8965d':
  Import translations. DO NOT MERGE
 2014-08-16 04:36:02 +00:00
Baligh Uddin
ea956433d9 am 92a65c74: (-s ours) am 4f7dec0e: (-s ours) am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit '92a65c74d779768a3e44c54eb32addef8cc00ad4':
  Import translations. DO NOT MERGE
 2014-08-16 04:35:46 +00:00
Santos Cordon
4adf4b0882 am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev 
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
  Fixing wrong tag usage
 2014-08-16 03:56:27 +00:00
Baligh Uddin
812938397e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
f14c0f79e1 Import translations. DO NOT MERGE 
Change-Id: Iad4e740bda603a5a7fb00961c82f01d34b07d8d4
Auto-generated-cl: translation import
 2014-08-15 22:19:11 -07:00
Kenny Root
f6040e9c11 Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 2014-08-16 03:52:42 +00:00
Michael Wright
8e5482f6ed Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-dev 2014-08-16 03:52:42 +00:00
Michael Wright
665366a305 Change 'disable hardware keyboard' to 'show input method' 
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
 2014-08-17 17:51:19 -07:00
Robert Greenwalt
804322564b Merge "Fix a logic error so mtu works." into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
e5df258491 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5db16fe79b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
d4f7e6cf72 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5398915d74 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
784006f2a1 Import translations. DO NOT MERGE 
Change-Id: I29a7b80cea6ddfa59c900472e05d9b72ba53c61f
Auto-generated-cl: translation import
 2014-08-15 22:03:24 -07:00
Baligh Uddin
0e900b611c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
80631ed867 Import translations. DO NOT MERGE 
Change-Id: I287e3613eab6a99a30a025ba979b3eae287478c3
Auto-generated-cl: translation import
 2014-08-15 22:05:22 -07:00
Baligh Uddin
e8c130f838 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
ab5c77cfcc Import translations. DO NOT MERGE 
Change-Id: Idc57a1961ba0cf31e9542f6bf2666cebc7e82c68
Auto-generated-cl: translation import
 2014-08-15 22:23:37 -07:00