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

183832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
1dd50c54b5 Only attempt to load .apk files in AssetManager 
This will reduce the number of files we must open
and reduce log spam.

Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
 2015-03-16 15:10:56 -07:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes 
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
 2015-03-09 15:28:29 -07:00
Chris Craik
0a75d4e96c Merge "Rewrite glop texture asserts" 2015-03-09 20:40:08 +00:00
Dianne Hackborn
442361c500 Merge "Battery stats issues: fix jiffy handling, print scan counts." 2015-03-09 20:36:58 +00:00
Chris Craik
eb911c2b0e Rewrite glop texture asserts 
bug:19641517

Also switch Glop VertexAttribFlags to use int for group of flags.

Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
 2015-03-09 13:36:35 -07:00
John Spurlock
5844bd4096 Merge "AudioService: Fix device dump in dumpsys output." 2015-03-09 18:49:58 +00:00
John Spurlock
1ff1e6edf1 AudioService: Fix device dump in dumpsys output. 
Bug: 19653026
Change-Id: Id09a502f1507477403c49be32ee0ed0f00ab288f
 2015-03-09 14:46:18 -04:00
Dianne Hackborn
62793e4382 Battery stats issues: fix jiffy handling, print scan counts. 
Issue #19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms

We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.

Issue #19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data

Added to the report (the information was already being tracked).

Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
 2015-03-09 11:15:41 -07:00
Wale Ogunwale
3c36b8e956 resolved conflicts for merge of ca54b876 to master 
Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d
 2015-03-09 10:37:04 -07:00
Olawale Ogunwale
ca54b87657 am edc3c893: am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely." 
* commit 'edc3c8939f3cde4ab9343e7654f5dac1122fb470':
  [ActivityManager] Skip receiver precisely.
 2015-03-09 16:43:16 +00:00
Olawale Ogunwale
edc3c8939f am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely." 
* commit '14ccc26f1ce006963f1a0b7a917404aa6a0e9da1':
  [ActivityManager] Skip receiver precisely.
 2015-03-09 16:36:31 +00:00
Olawale Ogunwale
14ccc26f1c Merge "[ActivityManager] Skip receiver precisely." 2015-03-09 16:30:52 +00:00
Adrian Roos
93891686eb Merge "Remove leftover code causing trust agent issues" 2015-03-09 16:06:43 +00:00
Adrian Roos
e71a2be2ba Merge "Revert "Remove TrustAgent whitelisting API"" 2015-03-09 16:04:18 +00:00
Adrian Roos
7863658c98 Merge "Prevent receiver leak in TrustAgentWrapper" 2015-03-09 16:03:21 +00:00
Geoff Mendal
39a4e9de2d am e88afe3e: (-s ours) am 146990b7: (-s ours) Import translations. DO NOT MERGE 
* commit 'e88afe3ee7b1944c8814f78f0eea41884d07600d':
  Import translations. DO NOT MERGE
 2015-03-09 15:49:29 +00:00
Bryce Lee
2a18cbcffa am 1b8df04b: am 8aeab6c8: Allow the keyguard service to be configurable. 
* commit '1b8df04b8d754f68dc6bfa6caa9e0a2666d16933':
  Allow the keyguard service to be configurable.
 2015-03-09 15:49:23 +00:00
Bryce Lee
d3b28408d1 am 168d0ade: am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev 
* commit '168d0ade0cb5a733c83d7dcfdf0a0efa3250cb16':
  Allow press and hold from non-interactive.
 2015-03-09 15:49:13 +00:00
Geoff Mendal
e88afe3ee7 am 146990b7: (-s ours) Import translations. DO NOT MERGE 
* commit '146990b7494c3fe6f47f6e8425ecb13f75007418':
  Import translations. DO NOT MERGE
 2015-03-09 15:35:56 +00:00
Bryce Lee
1b8df04b8d am 8aeab6c8: Allow the keyguard service to be configurable. 
* commit '8aeab6c8b9b89d77108fc05245561e33113fe27f':
  Allow the keyguard service to be configurable.
 2015-03-09 15:35:38 +00:00
Bryce Lee
168d0ade0c am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev 
* commit '1e53b98c38b6606859f4b33a98d776cbb65f1a42':
  Allow press and hold from non-interactive.
 2015-03-09 15:35:05 +00:00
Nicolas Prevot
6dc6876eed Merge "Add a new extra to specify the admin component for provisioning." 2015-03-09 14:53:24 +00:00
Nicolas Prevot
1844025738 Add a new extra to specify the admin component for provisioning. 
An app may have several device admins.
For this case, allow the caller to specify which one will become
an active device admin, and the profile owner (in the profile owner flow).

BUG:19348295
Change-Id: Ia5f995eed6c7f8933eb00d3250daa703ba6ee616
 2015-03-09 14:48:04 +00:00
Geoff Mendal
ee34679510 Merge "Import translations. DO NOT MERGE" 2015-03-09 14:41:18 +00:00
Geoff Mendal
7dd69f551f Import translations. DO NOT MERGE 
Change-Id: I9b6fac7639695f15cc7d1aa5b814bd6fa0872165
Auto-generated-cl: translation import
 2015-03-09 07:39:13 -07:00
Geoff Mendal
8951e572de Merge "Import translations. DO NOT MERGE" 2015-03-09 13:55:21 +00:00
Geoff Mendal
cfad35db63 Import translations. DO NOT MERGE 
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
 2015-03-09 06:40:26 -07:00
Geoff Mendal
cb93de1b7d Import translations. DO NOT MERGE 
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
 2015-03-09 06:23:28 -07:00
Geoff Mendal
146990b749 Import translations. DO NOT MERGE 
Change-Id: I9679db5505c907b78d3d97585d061f6746b0af7f
Auto-generated-cl: translation import
 2015-03-09 05:34:56 -07:00
Benjamin Franz
f3ece36535 Block setting wallpapers from managed profiles. 
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.

Bug: 18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
 2015-03-09 10:39:21 +00:00
Tor Norbye
b3ec733bb8 Annotate methods with size and range annotations 
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
 2015-03-07 20:49:19 -08:00
Tor Norbye
1c2bf03d10 Annotate return values with @CheckReturn 
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
 2015-03-07 20:49:18 -08:00
Tor Norbye
c615c6fc9c Annotate methods to be called from overrides with @CallSuper 
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
 2015-03-07 20:49:18 -08:00
Andreas Gampe
3aa2d01752 am 3f74f638: am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit '3f74f6386a15d09f27dbc81edd8dd2c13e298d73':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-08 00:17:54 +00:00
Andreas Gampe
967567541a am 208e80d9: am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit '208e80d931fd775de925529e0c36a34e9b7f916a':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-08 00:17:47 +00:00
Mathieu Chartier
5e3c29956b am ea3d53f5: am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties" 
* commit 'ea3d53f5a8f8e396bf8918041087db4603d444e5':
  Add JIT system properties
 2015-03-08 00:17:40 +00:00
Miao Wang
de770528ec am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker" 
* commit '989e03f144e8031f33af08945e845283dddcc8ad':
  [RenderScript] Update the java API about Allocation copyTo & From FieldPacker
 2015-03-08 00:17:34 +00:00
Miao Wang
b5c8004d6f am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable" 
* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d':
  [RenderScript] Add missing variable
 2015-03-08 00:17:27 +00:00
Miao Wang
12d8a860b8 am ec89c1ea: am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom." 
* commit 'ec89c1ea731256cd0d71ee58733b2855e1e6e4fa':
  [RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
 2015-03-08 00:17:18 +00:00
Andreas Gampe
3f74f6386a am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit '5596600697f54feb944737b7bc55df06123e6e54':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-08 00:08:25 +00:00
Andreas Gampe
208e80d931 am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit 'a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-08 00:08:19 +00:00
Mathieu Chartier
ea3d53f5a8 am 773bcfa7: am e59b7ce2: Merge "Add JIT system properties" 
* commit '773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00':
  Add JIT system properties
 2015-03-08 00:07:18 +00:00
Miao Wang
989e03f144 am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker" 
* commit 'c1e2bf95ab77127ea21ebd44b8615eca85338af1':
  [RenderScript] Update the java API about Allocation copyTo & From FieldPacker
 2015-03-08 00:07:09 +00:00
Miao Wang
449571c45e am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable" 
* commit '26f1a53838b2c8b77c0995801dcc1c7816c47f16':
  [RenderScript] Add missing variable
 2015-03-08 00:07:01 +00:00
Miao Wang
ec89c1ea73 am a61832c8: am 288e6f67: Merge "[RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom." 
* commit 'a61832c8fdff8cf086113f578032136c81935904':
  [RenderScript] AutoPadding & Unpadding for Vec3 Elements during copyTo & copyFrom.
 2015-03-08 00:06:55 +00:00
Mike Lockwood
d73ff8727d Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468 
* changes:
  MIDI Manager: Add explicit close mechanism for input and output ports
  MidiDeviceService: Add getDeviceInfo() accessor method
  Add MidiDevice.close() method so we can clean up our ServiceConnection
  Make MidiSender and MidiReceiver abstract classes, rename MidiReceiver.post() to receive()
  Eliminate MidiPort base class for MidiInputPort and MidiOutputPort
 2015-03-07 23:50:37 +00:00
Andreas Gampe
5596600697 am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit '7a4cb563a29f05658760739d3bc2e70bd6342174':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-07 17:13:16 +00:00
Andreas Gampe
a3d5b2304c am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance" 
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
  Frameworks/base: Remove unnecessary Pattern instance
 2015-03-07 17:13:09 +00:00
Scott Kennedy
6c4c58d6d9 Merge "Add more @Nullable annotations" 2015-03-07 01:34:49 +00:00
Scott Kennedy
ed2b5f8aca Add more @Nullable annotations 
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
 2015-03-06 17:24:58 -08:00